Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 843-844)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 84-87)

   - Update from CVS
   - Change capitalization of VC backend names for new backends

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-241

diff --cc lisp/ChangeLog.12
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/fileio.c
Simple merge